From: Tim Deegan Date: Thu, 15 Aug 2013 10:57:52 +0000 (+0100) Subject: xen: move -nostdinc into common Rules.mk. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6529 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=06a9c7e1928da40370d03515c68410a58989c274;p=xen.git xen: move -nostdinc into common Rules.mk. Previously we didn't use it at all the on ARM ports or for clang builds. For ARM, I think this is just an oversight. For clang, this used not to work, because '-withprefix include' didn't let us see stdarg.h, but that's fixed in clang v3.0. Also move the '-withprefix include' to beside -nostdinc as it's only needed with -nostdinc anyway. Signed-off-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- diff --git a/xen/Rules.mk b/xen/Rules.mk index c432ad6f6d..bbfc1acc3c 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -44,8 +44,12 @@ ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o CFLAGS-y += -fno-builtin -fno-common CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith CFLAGS-y += -pipe -CFLAGS-y += -iwithprefix include CFLAGS-y += -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +# Solaris puts stdarg.h &c in the system include directory. +ifneq ($(XEN_OS),SunOS) +CFLAGS-y += -nostdinc -iwithprefix include +endif + CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c CFLAGS-$(FLASK_ENABLE) += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index f629dff3f4..04c1a90477 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -19,12 +19,6 @@ xenoprof := y # supervisor_mode_kernel ?= n -# Solaris grabs stdarg.h and friends from the system include directory. -# Clang likewise. -ifneq ($(XEN_OS),SunOS) -CFLAGS-$(gcc) += -nostdinc -endif - CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default